merge trunk
authorK. Handa <handa@gnu.org>
Mon, 2 Sep 2013 14:22:02 +0000 (23:22 +0900)
committerK. Handa <handa@gnu.org>
Mon, 2 Sep 2013 14:22:02 +0000 (23:22 +0900)

Trivial merge